# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.706.4.4 -> 1.706.4.5
#	  include/linux/mm.h	1.42    -> 1.43   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/04	bjorn_helgaas@hp.com	1.706.2.3
# ia64: Reserve hugetlb syscall numbers.
# --------------------------------------------
# 02/10/04	agruen@suse.de	1.706.2.4
# ia64: Extended Attribute VFS syscalls.
# --------------------------------------------
# 02/10/04	bjorn_helgaas@hp.com	1.706.2.5
# ia64: Optimize load/save FPU (Fenghua Yu, Intel).
# --------------------------------------------
# 02/10/04	bjorn_helgaas@hp.com	1.706.4.5
# Restore VM_WRITECOMBINED and VM_NONCACHED constants so users will
# still compile (the kernel still ignores them, though).
# --------------------------------------------
#
diff -Nru a/include/linux/mm.h b/include/linux/mm.h
--- a/include/linux/mm.h	Wed Oct  8 09:07:51 2003
+++ b/include/linux/mm.h	Wed Oct  8 09:07:51 2003
@@ -103,6 +103,8 @@
 #define VM_DONTCOPY	0x00020000      /* Do not copy this vma on fork */
 #define VM_DONTEXPAND	0x00040000	/* Cannot expand with mremap() */
 #define VM_RESERVED	0x00080000	/* Don't unmap it from swap_out */
+#define VM_WRITECOMBINED 0x00100000	/* Write-combined */
+#define VM_NONCACHED	0x00200000	/* Noncached access */
 
 #define VM_STACK_FLAGS			(VM_DATA_DEFAULT_FLAGS | VM_GROWSDOWN)